Auto merge of #1482 - DavidAwad:patch-1, r=alexcrichton
authorbors <bors@rust-lang.org>
Sun, 5 Apr 2015 06:42:51 +0000 (06:42 +0000)
committerbors <bors@rust-lang.org>
Sun, 5 Apr 2015 06:42:51 +0000 (06:42 +0000)

Trivial merge